Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 30 Sep 2015 15:30:16 +0000 (17:30 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Wed, 30 Sep 2015 15:30:16 +0000 (17:30 +0200)

Trivial merge