Fix unlink(folder) failure on Windows using removeDirectory()
Merge remote-tracking branch 'johnstevenson/unlink-fix-2'