Merged in mavricknz/asn1-ber