Merge proposals

Pierre-Philippe Ouimet has no merge proposals.