Merge iOS 6 branch