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