Merge branch 'Haller' into 'master'

Haller

See merge request !53
2 jobs for master in 8 minutes and 31 seconds (queued for 1 second)
Status Name Job ID Coverage
  Linux
passed githubjob #1654816

00:00:55

passed masterJobLinux #1654817

00:08:31

67.0%