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