Merge proposals

lolo_house has no merge proposals.