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