Merge remote-tracking branch 'origin/master' dbe/142.1189
authorVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 15 Apr 2015 11:28:25 +0000 (14:28 +0300)
committerVladimir.Orlov <Vladimir.Orlov@jetbrains.com>
Wed, 15 Apr 2015 11:28:25 +0000 (14:28 +0300)

Trivial merge