Pull in upstream changes from OpenPGP.js