Merged gh-pages-upstream layout into this repo