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