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