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