Merge branch 'gh-pages'
now with more rolling upgrades!
Merge branch 'master' into gh-pages