full commit
Merge remote-tracking branch 'github/master' into gh-pages
update help
Merge branch 'master' into gh-pages
full commit