Merge proposals

Karsten S. Opdal has no merge proposals.