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