Merge branch 'bug#218' into 'master'

Fix for bug#218

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

00:00:05