Merge branch 'master' into selenium

# Conflicts:
#	extension/Tests/Unit/Core/Database/DatabaseUpdateTest.php
3 jobs for selenium in 2 minutes and 29 seconds (queued for 2 seconds)