2.1.1
Merge remote-tracking branch 'origin/2.0' into 2.1 # Conflicts: # code/SQLite3Database.php # code/SQLiteDatabaseConfigurationHelper.php
Merge remote-tracking branch 'origin/2.0' into 2.1 # Conflicts: # code/SQLite3Database.php # code/SQLiteDatabaseConfigurationHelper.php