Merge "Fixing compilation error on Mac OS."