Weird grammar, not sure I fixed it well enough.
Merge pull request #431 from btipling/master

Weird grammar, not sure I fixed it well enough.