Fixed a minor typo and spelling error
Merge branch '2.3.x'