Merge branch 'develop' into 'master'

Develop

See merge request !30
2 jobs for master in 5 minutes and 34 seconds (queued for 2 seconds)
Status Name Job ID Coverage
  Linux
passed githubjob #1086111

00:00:29

passed masterJobLinux #1086112

00:05:33