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

This reverts commit a75c320605dacf47365082c920ee3096cd7e2163.