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