Fixed typos.
Merge branch '1.8'.