Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 9 Feb 2015 18:24:35 +0000 (19:24 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 9 Feb 2015 18:24:35 +0000 (19:24 +0100)

Trivial merge