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