Merge proposals

Hans-Peter has no merge proposals.