Merge pull request #4632 from smutt/python-dpkt