Merge remote-tracking branch 'origin/master' into amakeev/debugger clion/162.163
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 12 May 2016 13:01:22 +0000 (15:01 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Thu, 12 May 2016 13:01:22 +0000 (15:01 +0200)

Trivial merge