Merge proposals

Christof Kaser has no merge proposals.