Merge pull request #17766 from alalek:backport_17756
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 6 Jul 2020 21:50:23 +0000 (21:50 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 6 Jul 2020 21:50:24 +0000 (21:50 +0000)
commitdcb7fd8520f0e7bfacd2e631a85b8ce0addd252f
treefbe7e98d3eeb038b09ee490e77605fa9c5b79909
parente4887aaa5bffc5e938c8d61bf39bb2427089e91f
parentd69a7a3bbf4260e0135bd79167dab0314a1a9dc3
Merge pull request #17766 from alalek:backport_17756