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

Manual merge of master