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

This reverts commit 84ac576b1e3d0f21dff76befa7cb93ec333c6307, reversing
changes made to 3544ecfb89689660138edb4390d36e4274f89a1d.
Revert "Merge branch 'gh-pages'"

This reverts commit e565a0e8ecac7ea5caf973467e09d1cdfc048f87, reversing
changes made to 68059807378a7f3dbb81d24481223a3f3d15042f.