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