Merge proposals

Dave W has no merge proposals.