Merge branch 'master' into gh-pages
notes
Merge branch 'gh-pages'