Merge pull request #1058 from billhollings/xcode12

Sync Xcode12 branch from master and support Xcode 11.7.