Merge branch 'development'
Clean-up files.
Merge branch 'master' into development