Merge remote-tracking branch 'origin/master' idea/140.58
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 10 Oct 2014 18:04:08 +0000 (20:04 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 10 Oct 2014 18:04:08 +0000 (20:04 +0200)

Trivial merge