Here is a rebased (to current master) patch.