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