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