Merge r1539309 from trunk

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