Merge pull request #1026 from billhollings/xcode12

Sync xcode12 with master.