Merge branch 'bug#95' into 'master'

Fix for Bug#95

See merge request !12
1 job for master
in 0 seconds, using 0 compute credits, and was queued for 15 seconds