XCode:4.6 to 5.1
Merge pull request #8957 from jonhari/patch-1

XCode:4.6 to 5.1