Merged r1527103,-5 from /trunk and resolved the tree conflict.

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