Merge pull request #5410 from jefferyto/python-pyasn1-0.4.2