Merge proposals

stephen w has no merge proposals.