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