* branches/issue-531-dev: Merged -r2412:2698 changes from /trunk. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/issue-531-dev@842776 13f79535-47bb-0310-9956-ffa450edef68