Port to Gnome 3.8