Merge proposals

Pierre R has no merge proposals.