Merge proposals

Stéphane Gourichon has no merge proposals.