Merge pull request #4692 from commodo/pyasn1-updates