Merge remote-tracking branch 'origin/master' into amakeev/debugger clion/162.256 clion/162.257 clion/162.262 clion/162.278
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 17 May 2016 17:58:08 +0000 (19:58 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 17 May 2016 17:58:08 +0000 (19:58 +0200)

Trivial merge