Merge pull request #2 from rjaffe/master

PAHMA-1009: Addl work - sanitize master
NOJIRA: Updating diffs