Merge remote-tracking branch 'origin/traff/vmprof-line-profiling' into traff/vmprof...
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 18 Oct 2016 10:59:01 +0000 (12:59 +0200)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Tue, 18 Oct 2016 10:59:01 +0000 (12:59 +0200)

Trivial merge