Merge proposals

Tor Syversen has no merge proposals.