/CC @cvrebert
I think this should be OK to merge now. But we can wait after 3.2.1 if you think that's better.