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