Fix typos.
Merge branch 'y511'