Merge pull request #3215 from jeffhostetler/windows_leak_diriter Fix memory leak on windows in diriter.