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

Bug#252

See merge request !49
1 job for v2.7.1
in 0 seconds, using 0 compute credits, and was queued for 14 seconds