clean-up
Merge branch 'master' into github-public