Merge branch 'develop' into 'master'

Develop

See merge request !30
2 jobs for master in 4 minutes and 4 seconds
Status Job ID Name Coverage
  Linux
passed BranchJobLinux #987226

00:02:49

passed masterJobLinux #987225

00:04:04