Merge pull request #16919 from alalek:backport_16860
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 27 Mar 2020 16:44:05 +0000 (16:44 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 27 Mar 2020 16:44:05 +0000 (16:44 +0000)
commit222a48577f296c76c60aafddac060cb8b403e385
tree60c78fac11bdd19e2b8432e47abcc2b2e65c8e09
parent353273579bdf29aec3cad63cf103bc2eb64ba522
parent2740901378d54de81730e837cd86f93b7e183ac2
Merge pull request #16919 from alalek:backport_16860