Gittrac #4361:  Added what should be a fix for this; need to do a
build/test on Windows to verify it...