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