Addresses #9032.
Merge pull request #9658 from thematthopkins/windows_cmd_script_fix

Addresses #9032.