Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 24 Oct 2016 15:18:02 +0000 (17:18 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Mon, 24 Oct 2016 15:18:02 +0000 (17:18 +0200)

Trivial merge