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