Merge pull request #648 (https://github.com/JetBrains/intellij-community/pull/648)
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 17 Oct 2017 18:40:51 +0000 (20:40 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 17 Oct 2017 18:40:51 +0000 (20:40 +0200)

Trivial merge