Merge pull request #378 (https://github.com/JetBrains/intellij-community/pull/378)
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 6 Apr 2016 16:48:08 +0000 (18:48 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 6 Apr 2016 16:48:08 +0000 (18:48 +0200)

Trivial merge