fix some typos
Merge pull request #2491 from minggo/master

fix some typos