Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 5 Nov 2014 10:08:41 +0000 (11:08 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 5 Nov 2014 10:08:41 +0000 (11:08 +0100)

Trivial merge