Merge pull request #2 from rjaffe/master

PAHMA-1009: Addl work - sanitize master
NOJIRA: Updating diffs
Merge pull request #4 from rjaffe/master

NOJIRA: Updating diffs
Merge branch 'master' into rev1

Conflicts:
	uploadmedia/postblob.sh
Merge pull request #5 from rjaffe/rev1

NOJIRA: Updating diffs