Merge pull request #1517 from larsoner/packaging

FIX: Packaging and 1.17.1 bump