Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 13 Feb 2015 14:13:22 +0000 (15:13 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Fri, 13 Feb 2015 14:13:22 +0000 (15:13 +0100)

Trivial merge