Fix whitespace
Merge branch 'fireteam2' into gb_master