Merge to 4.1-dev#7

dbeer merged 2 commits intoadaptivecomputing:4.1-devadaptivecomputing/torque:4.1-devfrom

mej:4.1-devmej/torque:4.1-devCopy head branch name to clipboard