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