OK, I messed those emails and the patches are completely mangled... oups! Here are the patches as attachments. I would normally use git send-email but it wasn't working for me today for some reason.