Merge remote-tracking branch 'origin/gnome-3-10'