Merge proposals

Petter Reinholdtsen has no merge proposals.