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