Merge proposals

Philippe Saint-Pierre has no merge proposals.