[Inkscape-devel] Merge on to experimental branch