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