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