Merge branch 'gh-pages'
Revert 05a4917..2687a42

This rolls back to commit 05a491753927ba073031c66a78ca41db32c1b6c3.
Merge branch 'master' into gh-pages