Merge remote-tracking branch 'origin/master' into amakeev/debugger-children+gdb-update-1
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 26 Apr 2016 14:04:16 +0000 (16:04 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Tue, 26 Apr 2016 14:04:16 +0000 (16:04 +0200)

Trivial merge