Merge PR #312 (https://github.com/JetBrains/intellij-community/pull/312)