Merge branch 'fix-memory-leak'
authorVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Wed, 11 Jan 2017 14:03:38 +0000 (17:03 +0300)
committerVitaliy.Bibaev <vitaliy.bibaev@jetbrains.com>
Wed, 11 Jan 2017 14:03:38 +0000 (17:03 +0300)

Trivial merge