Merge pull request #12794 from alalek:fix_warnings
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 10 Oct 2018 20:22:07 +0000 (20:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 10 Oct 2018 20:22:07 +0000 (20:22 +0000)

Trivial merge