Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 31 Oct 2014 12:33:17 +0000 (13:33 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 31 Oct 2014 12:33:17 +0000 (13:33 +0100)

Trivial merge