minor fix to remove linker warning
Merge branch 'xcodeproj' into prw-integration