fix typos in 2.0
fix typos in 2.1
Merge pull request #2087 from unkind/2.1

Fixed typos (2.1)