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