iOS 8 (release) fixes.
Merge