Merge pull request #2 from rjaffe/master

PAHMA-1009: Addl work - sanitize master
Merge pull request #3 from rjaffe/rev1

NOJIRA: Merge changes to master into previously-modified rev1 (see PAHMA_1009)
NOJIRA: Updating diffs
Merge pull request #4 from rjaffe/master

NOJIRA: Updating diffs
Merge branch 'master' into rev1

Conflicts:
	uploadmedia/postblob.sh