Update to latest ios standard

Merge up latest ios8 fixes.