Merge "Fix Darwin build." into idea133