Merge "Xcode 4.3 compatibility checkin"