bugfix for !95

Matthias Saimpertrequested to merge
cherry-pick-89233df2 into devel-2.2

(cherry picked from commit 89233df2)

being tested

Merge request reports