Merge proposals

Stéphane Roussel has no merge proposals.