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