Merge branch 'bug#93' into 'master'

Bug#93

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

00:00:04