am 4b030617: Merge "XCode 4.3+ compatibility check-in"

* commit '4b030617e74405779c657b98fa2b2e521adf4908':
  XCode 4.3+ compatibility check-in