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