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

Manual merge of master, including regression fixes from the android build merge