Merge proposals

Dave in Berkeley has no merge proposals.