Xcode 6.1 GM changes

Match current use of framework optionals