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