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