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