Merge proposals

Pål Bårdsen has no merge proposals.