Merge r1580650 from trunk and record a merge of r1580626.

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