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

Bug#251

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

00:00:08