Merge pull request #5181 from UtahDave/develop

add missing globals for Windows stuff.
Get proper Windows full pkg name