Merge 15875-15906 from trunk.



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