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

Address bug#244

See merge request !47
1 job for v2.7.1 in 0 seconds (queued for 14 seconds)