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