Enable browse-kill-ring's default keybindings
Pull in upstream changes
Merge with remote changes