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