Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 8 Jan 2015 11:33:40 +0000 (12:33 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Thu, 8 Jan 2015 11:33:40 +0000 (12:33 +0100)

Trivial merge