[Update] JJPluralForms (2.1)
Merge pull request #8497 from junjie/master

[Update] JJPluralForms (2.1)