Merge branch 'master' into gh-pages
build log
Merge branch 'gh-pages'