Revert "Merge branch 'gh-pages'"

This reverts commit 00b10013f5fae3d1bc247cf8b99c4163ff5dd058, reversing
changes made to 4c6419222484bda8aeb5638ef689931967e1bd07.
Revert "Revert "Merge branch 'gh-pages'""

This reverts commit 0a05f7f7fec7d36c785a17b7caceecea6e5eea9a.