Merged r1555491 from /trunk and resolved a minor conflict.

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