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

Trivial merge