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

Trivial merge