Merge remote-tracking branch 'origin/master'
authorRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 11 Oct 2016 14:37:45 +0000 (16:37 +0200)
committerRoman Shevchenko <roman.shevchenko@jetbrains.com>
Tue, 11 Oct 2016 14:37:45 +0000 (16:37 +0200)

Trivial merge