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