Merge proposals

Stephen G has no merge proposals.