Merge branch 'bug#132' into 'master'

Proposed fix for Bug#132

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