Pushed to wip-gnome. Closing ...