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