[Inkscape-devel] Merge in certain Ponyscape features