Merge pull request #383 (https://github.com/JetBrains/intellij-community/pull/383)
authorElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 19 Apr 2016 14:22:53 +0000 (17:22 +0300)
committerElizaveta Shashkova <Elizaveta.Shashkova@jetbrains.com>
Tue, 19 Apr 2016 14:22:53 +0000 (17:22 +0300)

Trivial merge