Pick up Alessandro's patch from https://bugzilla.gnome.org/show_bug.cgi?id=783913.
Fixes #408 (closed)