Merge pull request #171 into 2.5-fixes.
Merge branch '2.5-dev' of https://github.com/adaptivecomputing/torque into 2.5-dev