Merge proposals

Håvard Kvålen has no merge proposals.