Fix some simple typos
Merge branch 'release'