On svn_mutex branch: Bring up-to-date with /trunk.

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