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