Merge proposals

Mats-faugli has no merge proposals.