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