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