Merge proposals

Martin Thoresen has no merge proposals.