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