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