Merge branch 'master' into beta
Adjusting beta stamp
Merge branch 'beta' into gh-pages