Merge branch 'develop' into 'master'

Develop

See merge request !29
1 job for master in 4 minutes and 24 seconds (queued for 1 second)
Status Job ID Name Coverage
  Linux
passed #983438
masterJobLinux

00:04:24