Merge proposals

Per Ingulf Lillevold has no merge proposals.