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