Merge bnickel's iOS 7 fixes