Bring master and gh-pages in sync