changes for Xcode 6b3