Merge pull request #351 (https://github.com/JetBrains/intellij-community/pull/351)