Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 14 Jan 2015 18:49:16 +0000 (19:49 +0100)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 14 Jan 2015 18:49:16 +0000 (19:49 +0100)

Trivial merge