Merge branch 'develop' into 'master'

Develop

See merge request !74
1 job for master in 23 minutes and 18 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #2206
test

00:23:18