Merge branch 'bug#225' into 'master'

Fix for bug#225

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