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