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