Pull revision 13821
Merge branch 'master' of github.com:inkscape/inkscape