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