Merge proposals

Knut-petersen has no merge proposals.