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