Merge proposals

Chris Siebenmann has no merge proposals.