Merge master and add some experimental HUD changes