Revert "Revert "Merge pull request #114 from RallySoftware/S69537""

This reverts commit 058977acf4ebf6163b5d6bcdfe21df26cacabc60.