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