sync packager.patch with upstream
Merge pull request #595 from lslezak/packager_update

sync packager.patch with upstream