Merged minor typo updates from douglaswth
Merge remote-tracking branch 'upstream/master'