Merge r15906-r15938 from trunk.



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