Merge pull request #16903 from alalek:fix_16823_3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Mar 2020 15:53:08 +0000 (15:53 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 25 Mar 2020 15:53:08 +0000 (15:53 +0000)

Trivial merge