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