On the double-delete branch, merge outstanding changes from trunk
up to r32867.

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