Merge pull request #2639 from bradymiller/package-update