Merge branch 'bug#254' into 'v2.7.1'

Fix for bug#254

See merge request !52
1 job from v2.7.1 in 0 seconds (queued for 16 seconds)
Status Job ID Name Coverage
  External
passed jenkins

00:00:08