Merge proposals

michael bishop <clever@nbnet.nb.ca> has no merge proposals.