IDEX-834
Merge branch 'master' of https://github.com/codenvy/platform-api