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