Merge proposals

Frédéric Péters has no merge proposals.