Fix XC6 error
Merge remote-tracking branch 'origin/develop' into NG/37062_BuildOn6
Fix Xcode 6 error