Missed gcc refs
Merge remote-tracking branch 'origin/master' into merge
Resolve more gcc->cc renames