Merge pull request #3730 from paralogizing/develop

Consistent DIRECTORY_SEPARATOR usage in Zip::read_dir()