Merge proposals

Riccardo Casatta has no merge proposals.