Merge proposals

Ingar Saltvik has no merge proposals.