Merge pull request #1044 from ericfrederich/more_illegal_windows_filenames

support more illegal Windows filenames