Merge pull request #18922 from alalek:3.4-xcode12
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 26 Nov 2020 22:14:55 +0000 (22:14 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Thu, 26 Nov 2020 22:14:55 +0000 (22:14 +0000)

Trivial merge