Merge proposals

Trygve Vea has no merge proposals.