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