Merge remote-tracking branch 'upstream/3.4' into merge-3.4
authorOpenCV Developers <dev@opencv.org>
Sat, 23 Apr 2022 18:59:59 +0000 (18:59 +0000)
committerOpenCV Developers <dev@opencv.org>
Sat, 23 Apr 2022 19:00:10 +0000 (19:00 +0000)

Trivial merge