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