Merge proposals

Øivind Hoel has no merge proposals.