Fix bug where singular values get plural endings #2069
selbekk wants to merge
selbekk:bug/make-endings-singular
into thepracticaldev:master
selbekk:bug/make-endings-singular
into thepracticaldev:master