Revert "Merge branch 'gh-pages'"

This reverts commit b7eb352fb9e27c72b22b22beed888e93c62944c5, reversing
changes made to 089aa1c87539b20efa9afbf09d5bf6e3bc788e4c.
Revert "Revert "Merge branch 'gh-pages'""

This reverts commit 7a6f1c425a1a352d3fb67ee4bd5e2dd30bcc4eb2.
Revert 089aa1c..a94a268

This rolls back to commit 089aa1c87539b20efa9afbf09d5bf6e3bc788e4c.