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