Added better patch for recursion into subdirs on import.
Removed previous patch.
Updated patched file.