Merge branch 'master' into amakeev/run_environment
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 21 Jan 2016 14:12:23 +0000 (15:12 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 21 Jan 2016 14:12:23 +0000 (15:12 +0100)

Trivial merge