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