Merge branch 'develop' into 'master'

Develop

See merge request !64
1 job for master in 30 minutes and 31 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #1723
test

00:30:31