Merge commit '4b7961a' into pyasn1_0.4.3 am: 5934c9ecff
am: 156b75dab2

Change-Id: I7e87877f8581be5bc3606f064478c4c91c2d07c5