merge from GNOME master