Merge branch 'bug#92' into 'master'

Fix for bug#92

See merge request !25
1 job for master in 0 seconds (queued for 13 seconds)