Merge "Fix OSX build failure:gid # is too big >2097151"