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