Update for Gnome 3.6, including a bug workaround