On the 1.6.x-issue3506 branch, merge r879966 and r879971 from trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-issue3506@934631 13f79535-47bb-0310-9956-ffa450edef68
4 files changed