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