Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 24 Nov 2014 13:14:18 +0000 (14:14 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 24 Nov 2014 13:14:18 +0000 (14:14 +0100)

Trivial merge