iOS buildfix
Merge pull request #3418 from theavengerr/master

iOS buildfix