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