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