Prepare for iOS 7 merge.