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