Merge pull request #4299 from Voyager1/zip-rootisdir