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