Fix a few typos.
Merge branch 'master' into gcc_refactor