am c31de501: Merge "More Mac fix."

* commit 'c31de5011a2b73af04d9e85dca863352458104ca':
  More Mac fix.