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