Plurals and Singulars OH MY!

Fixes #1039
Merge pull request #1091 from NuGet/anurse-1039-pluralsandsingulars

Plurals and Singulars OH MY!