Merge from trunk


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/svndiff1@857501 13f79535-47bb-0310-9956-ffa450edef68