Merge branch 'gnome-3-10'