Merge proposals

Andras Hipsag has no merge proposals.