Two booboos in a short time?!
Merge remote-tracking branch 'origin/master' into AH-565_HudImprovements