Merge proposals

Jonathan St-Cyr has no merge proposals.