Merge proposals

Stéphane Mottelet has no merge proposals.