Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 Feb 2015 17:26:01 +0000 (18:26 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 11 Feb 2015 17:26:01 +0000 (18:26 +0100)

Trivial merge