> Fixed in the attached patch.
v7 needs a rebase.
Also, you might try to produce a version which is compatible with Robert's constraints.
-- Fabien.