On the patch-from-stream branch: Synced from trunk r1936561. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/patch-from-stream@1936562 13f79535-47bb-0310-9956-ffa450edef68