match with gh-pages and master

lazy man's merge conflict resolution