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