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