FL-1329: change merges to do the right thing for gnome-3.12