Merge pull request #10194 from mshabunin:fix-gcc7-warnings
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 29 Nov 2017 18:22:40 +0000 (18:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 29 Nov 2017 18:22:40 +0000 (18:22 +0000)

Trivial merge