Merge branch 'develop' into 'master'

Develop

See merge request !57
1 job for master in 26 minutes and 5 seconds (queued for 2 minutes and 45 seconds)
Status Job ID Name Coverage
  Test
passed #1288
test

00:26:05