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