Merge proposals

damien has no merge proposals.