To get fixes from userhosts!2

The main reason is to fix inkscape segfaults that break ERP5's svg to
image conversion.