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