Merge pull request #20628 from alalek:fix_build_warnings_4.x
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 30 Aug 2021 08:26:51 +0000 (08:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 30 Aug 2021 08:26:51 +0000 (08:26 +0000)

Trivial merge