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