Merge branch 'master' into gh-pages
updated term
Merge branch 'gh-pages' into working-copy