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