Merge r1482759 and r1482779 from trunk onto the 1.6.x-r1482759 branch.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/1.6.x-r1482759@1483594 13f79535-47bb-0310-9956-ffa450edef68