On the 'gnome-keyring' branch:
Merge r31297:31335 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/gnome-keyring@871410 13f79535-47bb-0310-9956-ffa450edef68