Merge branch 'bug#211' into 'master'

Address bug#211

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

00:00:05