Merge branch 'develop' into 'master'

Develop

See merge request !29
2 jobs for master in 4 minutes and 31 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Linux
passed #775815
BranchJobLinux

00:02:13

passed #775814
masterJobLinux

00:04:31