IDEX-1174
Merge branch 'master' of github.com:codenvy/ide