Tweaks to get things compiling on iOS.
Merge branch 'release-6.6.2' into develop