Update from GNOME master