Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 24 Feb 2015 19:44:28 +0000 (20:44 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 24 Feb 2015 19:44:28 +0000 (20:44 +0100)

Trivial merge