iOS 7 / XCode 5 compatibility merge