Merge "Possible Mac build fix."