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