Merge branch 'develop' into 'master'

Spring Release 21-03-19

See merge request !271
4 jobs for master in 4 minutes and 2 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #12580
test:php

00:00:13

 
  Build
passed #12581
build

00:00:30

 
  Layout
passed #12582
layout

00:01:55

 
  Deploy
passed #12583
deploy-master

00:01:23