Merge proposals

Martin Wehrli has no merge proposals.