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