https://bugzilla.gnome.org/show_bug.cgi?id=687520
Includes all the fixes necessary to make stuff compile again.