Merge branch 'master' into gh-pages
try this
Merge branch 'gh-pages'