Merge proposals

Håvard Berland has no merge proposals.