Merge branch 'gnome-3-8'