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