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