Merged Xcode Project file from upstream