On the performance branch: Bring up-to-date with trunk.
[may not compile due to merge artifacts that will be resolved later]

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