Merge branch 'bc/gnome-keyring'