Merge branch 'master' into gh-pages
restoring text deleted accidentally
Merge branch 'gh-pages'