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