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