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