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