Hi Daniel and João,

I said in bug#48013 that I was working on this, but I was waiting for my 
copyright assignment to complete before sending patches.  Anyway, 
apparently you've now taken this over, which is fine.  Alas I have no time 
to look at what you did to send useful comments this week.

Gregory