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