Fix some weird typos.
Merge remote-tracking branch 'origin/master'