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