Merge gh-pages changes