Support iOS 8.1/Xcode 6.1