Merge branch 'master' into gh-pages
6 size
Merge branch 'gh-pages'