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