Merge branch 'hotline' into 'master'

Hotline

See merge request !3449
2 jobs from master in 43 minutes and 49 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #20767
docker
test:php5_latest

00:43:49

passed #20768
docker
test:php7_latest

00:22:56