Merge pull request #7165 from nupplaphil/task/mod_dirfind