spelling fixes
Merge origin/master