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