Merge branch 'nb/gnome-keyring-build'