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