Fixes two typos.
Merge branch 'master' into koma