Merge proposals

Jim Blandy has no merge proposals.