Fix typos
Merge pull request #2832 from jwworth/master

Fix typos