backporting PRIAM-193 to the 1.1 branch
Merge pull request #195 from jasobrown/1.1

backporting PRIAM-193 to the 1.1 branch