On the fsfs-pack branch: Bring up-to-date with trunk. git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/fsfs-pack@874575 13f79535-47bb-0310-9956-ffa450edef68