Merge gh-pages with master