master
Add back accidentially deleted pkg sub-dir.
Bring over Windows NSIS installer and packaging fixes from 3006.x