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