Merge proposals

christophb has no merge proposals.