Cleanup commit and clear mechanism
Merge branch 'master' into gh-pages