Merge branch 'bug#213' into 'master'

Fix for bug#213

See merge request !37
1 job for master in 0 seconds (queued for 15 seconds)