Merge branch 'amakeev/run_environment'
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 4 Feb 2016 15:58:26 +0000 (16:58 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 4 Feb 2016 15:58:26 +0000 (16:58 +0100)

Trivial merge