Update to handle iOS 8.2
Merge pull request #4278 from imurchie/isaac-ios82

Update to handle iOS 8.2