Merge pull request #17633 from alalek:backport_17616
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 23 Jun 2020 18:29:55 +0000 (18:29 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 23 Jun 2020 18:29:55 +0000 (18:29 +0000)
commit8cc8b0d2b443db8fbb811fc73fba308c7ba3b934
tree39dd42ebf6dfedf7d85b44f10ae4ecefb7269216
parent7fae2e834c425af39fa70ad1f9c317690c3cac98
parentad5e70f94e81ce2614365abf57af3964ec2bb33e
Merge pull request #17633 from alalek:backport_17616