Merge branch 'develop' into 'master'

Deploy 2019-03-19

See merge request !942
2 jobs from master in 37 minutes and 34 seconds (queued for 20 seconds)
Status Job ID Name Coverage
  Test
passed #95180
system

00:37:34

passed #95179
test

00:08:31