Fix typo
Merge branch '2.2.x'