Merge with orig for iOS7.