Merge branch 'hotline' into 'master'

Hotline

See merge request !3000
2 jobs from master in 33 minutes and 11 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #12675
docker
test:php5_latest

00:33:11

passed #12676
docker
test:php7_latest

00:29:17