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