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