PAHMA-1009: sanitize master
Merge branch 'master' into rev1
PAHMA-1009: sanitize
NOJIRA: Merge changes made in master to previously-modified rev1 (see PAHMA_1009)
Merge pull request #3 from rjaffe/rev1

NOJIRA: Merge changes to master into previously-modified rev1 (see PAHMA_1009)