Merge proposals

Frédéric Moreau has no merge proposals.