Merge pull request #17557 from alalek:backport_17554
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Jun 2020 19:26:11 +0000 (19:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Jun 2020 19:26:11 +0000 (19:26 +0000)
commitc7dcdc0e884884439e2e12f6d5c800cc69386465
tree9d6f109959c814f87399eedea69e3d3e47e94da4
parenteb67dc9f50bc1de8bd5d6f03a8a23adffdc2db43
parent676b818d6aefeb445e552a33081e34221cf5f8bc
Merge pull request #17557 from alalek:backport_17554