Merge from 4.1-dev tor TRQ-1560.
Merge branch 'master' of https://github.com/adaptivecomputing/torque