On the 'svnpatch-diff' branch:
Merge r36389:36402 from trunk.


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