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