iOS 7 fix
Merge commit '2766e8854c86d475b9942a366a3d0e93d13dd6a1' into HEAD