Cleanup.
Merge branch 'master' of github.com:nerdfiles/core into develop