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