revert branch merge 3936eefaa which merged master with gh-pages