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