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