Merge branch 'master' into gh-pages
shorter string
Merge branch 'gh-pages'