Merge pull request #18243 from alalek:static_code_fixes
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 2 Sep 2020 22:50:00 +0000 (22:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 2 Sep 2020 22:50:00 +0000 (22:50 +0000)

Trivial merge