Merge branch 'master' of https://github.com/dmitry-zhuravlev/intellij-community
authorVladislav.Soroka <Vladislav.Soroka@jetbrains.com>
Thu, 28 Apr 2016 10:30:37 +0000 (13:30 +0300)
committerVladislav.Soroka <Vladislav.Soroka@jetbrains.com>
Thu, 28 Apr 2016 10:30:37 +0000 (13:30 +0300)

Trivial merge