Merge proposals

Svein Olav Hagen has no merge proposals.