Merge branch 'gnome-3-0'