I applied the attached patch to current but I don't have the 7.0 brancharound so if you want it there as well it's yours for the taking.
-- Peter Eisentraut Sernanders väg 10:115peter_e(at)gmx(dot)net 75262 Uppsalahttp://yi.org/peter-e/ Sweden