Merge branch 'IDEA-132015' of https://github.com/siosio/intellij-community