Comment 7 for bug 1758920

I've uploaded with some changes. Jean-Baptiste said he's going to be out this evening, so what I'm going to do is set block-proposed and ask him to review. If it seems okay, please remove the tag and it should migrate. Otherwise we can follow-up with fixes next week.