Merge branch 'gnome-3-4'