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

* commit 'ce21c1c57355a0bf95695792f3430ced1cca5d75':
  More Mac fix.