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

Bug#252

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

00:00:07