Merge pull request #8997 from alalek:fix_build_warnings
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 27 Jun 2017 09:57:38 +0000 (09:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 27 Jun 2017 09:57:39 +0000 (09:57 +0000)

Trivial merge