Merge branch 'master' into gh-pages
This could take a while...
Merge branch 'gh-pages'