Merge branch 'develop' into 'master'

Develop

See merge request !27
1 job for master in 5 minutes and 40 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Linux
passed #760820
masterJobLinux

00:05:40