Merge branch 'skillmenu'