On the swig-py3 branch: Sync from trunk up to r1869352.

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