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