Merged Xcode project changes with recent development pull.