am d52afdd6: Merge "(Hopefully) fix the Mac build."

* commit 'd52afdd682b26ea6a13c066d6f037c9df6693489':
  (Hopefully) fix the Mac build.