Merge proposals

Ole-Morten Duesund has no merge proposals.