Merge branch 'PR2' into 'master'

Proposed fix for bug 87

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

00:00:07