Merge gh-pages and master