Merge remote-tracking branch 'refs/remotes/origin/hotline' into origin-master

Conflicts:
	cosmogramme/sql/patch/patch_361.php
	tests/db/UpgradeDBTest.php
2 jobs from WIP in 32 minutes and 19 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #11856
docker
test:php5_latest

00:32:19

passed #11857
docker
test:php7_latest

00:29:33