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