Update history to reflect merge of #2238 [ci skip]