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