Bringing the master up to date in terms of Xcode workspace and project settings.