Merge plurality fix

Benjamin Mako Hill || Want to submit a patch?