Merge proposals

Balazs Nemeth has no merge proposals.