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