Spelling errors
Merge branch 'master' into no-conflict