Merge "Fix broken build on Mac."