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

This reverts commit 883bfc27aa027fbd1d42976dca5abf953e6bce29.