Merge branch 'bug#211' into 'master'

Address bug#211

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