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