Merge pull request #8766 from alalek:trace
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 26 Jun 2017 16:03:43 +0000 (16:03 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 26 Jun 2017 16:03:43 +0000 (16:03 +0000)

Trivial merge