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