Merge pull request #2643 from comex/fix-do-file-search Fix DoFileSearch returning the passed-in directories themselves.
