am 79d8f41e: Merge "Fix building on modern versions of Xcode and OS X."

* commit '79d8f41e1d5490784288e2a0737be334ef50e7f6':
  Fix building on modern versions of Xcode and OS X.