[Inkscape-devel] Merge my branch into trunk