Merge pull request #4222 from nikil/moreutils