Merged iOS 7 fix