Merge proposals

Jean-Philippe has no merge proposals.