Merge "XCode 4.3+ compatibility check-in"