Fix a typo.
Merge branch 'release-2.0.x'