[TIMOB-14095] Fix build failing with Xcode 4.4.1
Merge pull request #4352 from jonalter/timob-14095-3_1_X

[TIMOB-14095] Fix build failing with Xcode 4.4.1