Merge pull request #3566 from nikil/moreutils