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