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