Merge changes from coreutils.