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

Manual merge of master
Fixed a bug with template project names