On the '1.7.x-issue4332' branch, merge from trunk r1454088, resolving
conflicts as needed.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.7.x-issue4332@1454090 13f79535-47bb-0310-9956-ffa450edef68