5 and cleanup
5 recommit
Merge branch 'master' into gh-pages