Merge proposals

Joël TROCH has no merge proposals.