Merge "Fixing Mac OS build."