Porting of gnome 3.6 (from MC)