Merge branch 'master' into gh-pages
Adding comments
Merge branch 'gh-pages'