Patches from Debian

Hi,

we applied these two patches. Please include them.
Packaging: literally the worst thing about Python.

This does seem like a good change.