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