Merge pull request #9606 from sovrasov:fix_gcc7_warnings
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 11 Sep 2017 18:45:30 +0000 (18:45 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 11 Sep 2017 18:45:31 +0000 (18:45 +0000)

Trivial merge