Here are the patches.

One of them is for the 'keyring' branch, and the other is for 'master'.