Move changes from #1221 to gh-pages