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