More merges from coreutils, etc.