am ee022be9: am c31de501: Merge "More Mac fix."

* commit 'ee022be9f8ab7614efaba9f393f6eb42f92fe43b':
  More Mac fix.