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

Fix for bug#247

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

00:00:04