Merged fix from the 4.1-dev branch for trq-1690.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev