Merge remote-tracking branch 'origin/master' into amakeev/debugger
authorAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 6 May 2016 20:37:55 +0000 (22:37 +0200)
committerAnton Makeev <Anton.Makeev@jetbrains.com>
Fri, 6 May 2016 20:37:55 +0000 (22:37 +0200)

Trivial merge