Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 6 Oct 2014 13:33:18 +0000 (15:33 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 6 Oct 2014 13:33:18 +0000 (15:33 +0200)

Trivial merge