Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 26 Nov 2014 10:48:45 +0000 (11:48 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 26 Nov 2014 10:48:45 +0000 (11:48 +0100)

Trivial merge