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