Remove UU stamp since we're on the public internet
Merging 'master' into 'gh-pages'