Fixed a crash in iOS 8 Beta 5
Merge branch 'master' into iOS8