Merge branch 'bug#225' into 'master'

Fix for bug#225

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

00:00:05