Merge master and gh-pages branches