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