Merge branch 'bug#169' into 'master'

Proposed fix for Bug#169

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

00:00:05