Merge branch 'bug#95' into 'master'

Fix for Bug#95

See merge request !12
1 job from master in 0 seconds (queued for 15 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:04