Merge branch 'master' into gh-pages
logging asset path
Merge branch 'gh-pages'