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