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