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

This reverts commit 3f88719e7a4ea9e0d7688f9afb5d1cfd42448468.