Merge proposals

Carl Thayer has no merge proposals.