On the 'diff-cmd-feature' branch: sync with trunk@r1936562.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/diff-cmd-feature@1936563 13f79535-47bb-0310-9956-ffa450edef68