Merge remote-tracking branch 'origin/master' into amakeev/run_environment appcode/144.3627 clion/144.3630
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 2 Feb 2016 14:39:06 +0000 (15:39 +0100)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 2 Feb 2016 14:39:06 +0000 (15:39 +0100)

Trivial merge