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