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