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