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