Comment 9 for bug 771959

Fix for the issue commited in
https://gitlab.com/Ede123/inkscape/compare/f45c0191ca0797a39d98b0ddad3a79e6e1efad4c...82b42536b29ccb2f93f4bd156c7fa20367920348

(the first commit is the patch by Michael, the second commit fixes a related issue I found during review)

If no regressions are found I'll back-port this to 0.92.x soonish.