Merge branch 'hotline' into 'master'

Hotline

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

00:51:51

passed #20723
docker
test:php7_latest

00:28:01