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)
Status Name Job ID Coverage
  Before
passed documentation #2528

00:00:39

 
  Build
passed snapshot #2529

00:01:12

 
  Selenium
passed selenium #2530

00:00:36