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