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