Manually merge in relevant parts of github pull request #163.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev