On the 'addremove' branch, merge outstanding changes from trunk.


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