Merge proposals

ichapman@videotron.ca has no merge proposals.