Assorted spelling fixes

No functional change.
Big assorted spelling fixes

No functional change.
Merge remote-tracking branch 'upstream/master'