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