Mostly correcting typos
Merge branch 'master' into dev