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