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