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