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