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