Hello Julien,

I've updated the patch according to your suggestions.  Could you please
take a look?