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