On the 'addremove' branch: sync with trunk@r1936564. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/addremove@1936565 13f79535-47bb-0310-9956-ffa450edef68