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