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