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