Merge branch 'master' into gh-pages
Revert "Merge branch 'master' into gh-pages"

This reverts commit 2bc5946b634ed4a293f163b49f63908983486735, reversing
changes made to 6f9ff5c69066490fb519f7e76e82fea92a61ee29.
Change baseurl to /
Clear baseurl
Merge branch 'gh-pages'