Merge pull request #17663 from alalek:backport_17658
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 26 Jun 2020 17:41:53 +0000 (17:41 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 26 Jun 2020 17:41:53 +0000 (17:41 +0000)
commit923009b5ff407f11c2bce780f1108fa477190b42
treec01c14963440fadc232cabcbc3ce1667eb8a2a97
parent4064d4c7ebf44b67500d393f9349aaa88e421953
parente58ce89b10619c3507278564226270a94150ad10
Merge pull request #17663 from alalek:backport_17658