bringing gh-pages branch up to date with master