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

Bug#251

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