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