Merge branch 'develop' into 'master'

Develop

See merge request !27
3 jobs for master in 1 second (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #1685
production
job 1

00:00:01

failed #1683
production
job 1

00:00:03

passed #1684
production
job 1

00:00:02