Merge remote-tracking branch 'origin/master' idea/138.1597
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 12 Aug 2014 13:36:58 +0000 (17:36 +0400)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 12 Aug 2014 13:36:58 +0000 (17:36 +0400)

Trivial merge