Cleanup, p. 2.
Merge branch 'master' of github.com:cocaine/cocaine-core