Sync with marcuscom gnome 3_12 branch again