fix 64-bit iOS builds
Merge branch '409-squash'