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