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