Merge pull request #11188 from mshabunin:fix-clang-warnings
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 29 Mar 2018 14:34:30 +0000 (14:34 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 29 Mar 2018 14:34:30 +0000 (14:34 +0000)

Trivial merge