Merge remote-tracking branch 'stats-collector/master' into community/master
authorVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Mon, 7 May 2018 15:32:08 +0000 (18:32 +0300)
committerVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Mon, 7 May 2018 15:32:08 +0000 (18:32 +0300)

Trivial merge