Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !19
4 jobs for master in 1 minute and 15 seconds
Status Name Job ID Coverage
  Deploy
passed pages #87617

00:01:15

passed pages:deploy

00:00:00

passed pages #87614

00:01:11

passed pages:deploy

00:00:00