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