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