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