Merging stable newgui back into team9dev for branch cleanup