Merge branch 'issue_93' into 'master'

Issue 93

See merge request !79
2 jobs for 1.5.6 in 4 minutes and 54 seconds
latest
Status Job ID Name Coverage
  Build
passed #20015
build

00:01:53

 
  Deploy
passed #20016
allowed to fail manual
deploy

00:03:00