Merge pull request #9238 from alalek:valgrind_fixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 27 Jul 2017 14:33:00 +0000 (14:33 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 27 Jul 2017 14:33:01 +0000 (14:33 +0000)

Trivial merge