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