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