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