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