Merge pull request #4842 from bryan-m-hughes/mw_windows_packaging

Quick bug fix