Merge proposals

Dieter Kargl has no merge proposals.