Merge proposals

Sigurd Aas has no merge proposals.