Merge branch 'hotline' into 'master'

Hotline

See merge request !3456
2 jobs from master in 45 minutes and 18 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #20817
docker
test:php5_latest

00:45:18

passed #20818
docker
test:php7_latest

00:24:16