Merge branch 'bug#132' into 'master'

Proposed fix for Bug#132

See merge request !18
1 job for master in 0 seconds (queued for 10 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:05