Merge branch 'develop' into 'master'

Release 2019-03-20

See merge request !270
4 jobs from master in 5 minutes and 56 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #12561
test:php

00:00:14

 
  Build
passed #12562
build

00:00:30

 
  Layout
passed #12563
layout

00:03:48

 
  Deploy
passed #12564
deploy-master

00:01:22