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