This merge seems ok to me.

Thanks,
Maxime (not a committer)