This branch exists for reboot of issues #3668 and #3669, see
http://subversion.tigris.org/issues/show_bug.cgi?id=4013#desc3