Merge changes from trunk by comparing trunkURL with branchURL.



git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/python-bindings-improvements@856027 13f79535-47bb-0310-9956-ffa450edef68