Merge proposals

lacroix has no merge proposals.