Merge the tc-issue-3334 branch to trunk:
treeabb2c1b29fb17c369bb8c7887ff85581783503b4
drwxr-xr-x - svntest