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