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