Merge branch 'hotline' into 'master'

Hotline

See merge request !3128
2 jobs from master in 35 minutes and 50 seconds
Status Job ID Name Coverage
  Test
passed #14403
docker
test:php5_latest

00:35:50

passed #14404
docker
test:php7_latest

00:32:33