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