(cherry picked from commit c553ca54d5) And fixup previous bogus cherry-pick that included merge conflicts.
c553ca54d5
They didn't show up at all in the rendered PNG, but were pretty annoying when working with Gobot face on Inkscape (cherry picked from commit 17b9cb2cdf)
17b9cb2cdf