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

00:00:39

 
  Build
passed #2529
snapshot

00:01:12

 
  Selenium
passed #2530
selenium

00:00:36