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