On the '1.6.x-issue3303' branch:

Merge from trunk (with conflict resolution and changes due to latest
development in trunk) r950931, 950933.


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