Merge proposals

Peter Bieringer has no merge proposals.