Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 24 Oct 2014 15:12:14 +0000 (17:12 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 24 Oct 2014 15:12:14 +0000 (17:12 +0200)

Trivial merge