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