Addressed an iOS 7-related crash
Merge branch 'official_master'