am 4361173d: Merge "Another go at fixing the Mac build."

* commit '4361173d8b9d348e9566f754044db3fedfdf47eb':
  Another go at fixing the Mac build.