On the 'kwallet' branch:
Merge r31194:31237 from trunk.


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