TRQ-2010. Backport pull request 154 (from Matt Ezell) to 4.2-dev.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev