Merge pull request #17729 from modeste2015:3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 4 Jul 2020 17:17:57 +0000 (17:17 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 4 Jul 2020 17:17:57 +0000 (17:17 +0000)

Trivial merge