Merge branch 'master' into gh-pages
edit margin summary
Merge branch 'gh-pages'