Merge proposals

Kjell has no merge proposals.