Rebase gh-pages on master