Merge branch 'master' into amakeev/run_environment
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 13 Jan 2016 19:01:01 +0000 (20:01 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Wed, 13 Jan 2016 19:01:01 +0000 (20:01 +0100)

Trivial merge