Hi,

Do you think those two patches could go in?  They still apply and
compile on master.
-- 
Manuel Giraud