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