Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
more fixes
Merge branch 'gh-pages'