Merge branch 'failsafe' of https://github.com/diorcety/intellij-community
authorVladislav.Soroka <Vladislav.Soroka@jetbrains.com>
Tue, 28 Jun 2016 14:25:00 +0000 (17:25 +0300)
committerVladislav.Soroka <Vladislav.Soroka@jetbrains.com>
Tue, 28 Jun 2016 14:25:00 +0000 (17:25 +0300)

Trivial merge