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