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