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