Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !58
2 jobs for master in 54 seconds
Status Name Job ID Coverage
  Deploy
passed pages #113342

00:00:54

passed pages:deploy

00:00:00