Merge branch 'gnome-3-6'