fix pluralization since "a" is in front
Merge pull request #7287 from waynn/patch-1

fix pluralization since "a" is in front for issue #6342
Merge branch 'master' into 3.0.0-wip