Merge the gh-pages-upstream