This patch was stalled because it required changes to a cpan upstream module, which have now been done, so is now submitted, rebased.