iOS 7 fixes
Merge pull request #5274 from tonimoeckel/master

iOS 7 fixes