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