Merge proposals

Jon Ove Holen has no merge proposals.