Maynard Johnson - 2014-01-02

Received positive feedback on the attached patch from a couple of community members, so I committed it upstream today.