replace or remove unused assets
Merge branch 'master' into gh-pages